Merge pull request #10 from rayburgemeestre/autotrack

Merge master changes into autotrack branch
Simplify if-statement
Merge branch 'master' of github.com:rayburgemeestre/PhotoSwipe into autotrack