catch conversion
Merge branch 'master' of github.com:sigmonsays/screenshot
 big refactor