Credit where credit's due
Merge branch 'master' of github.com:beezly/filercam