fixes #262
Merge branch 'master' of github.com:Strider-CD/strider