fixes #9
Merge branch 'master' of github.com:greg0ire/git_template