Resolves #1 and also hopefully fixes #3
Merge branch 'master' of github.com:jiemakel/snapper