fixing #21
Merge branch 'master' of github.com:memery/phoenicz