fix shitty bug
Merge branch 'master' of github.com:blackchair/parley