Fixes
Merge branch 'master' of github.com:kevbook/fixie-client