Merge branch 'hotfix/95'

Close #95
Merge branch 'master' of https://github.com/Wilt/PhlyRestfully