Merge branch 'refs/heads/development'
Cleaned up code
screen -> screens
ScreenCapture Exception handling
Merge branch 'refs/heads/master' into development