Merge "refactored screenshot code"