Merge branch 'develop'
Merge pull request #34 from ceesvanegmond/develop

Develop
Merge branch 'master' of github.com:ceesvanegmond/minify
Merge branch 'amalfra-patch-1' into develop