Updating project
Fixing up
Merge branch 'master' of github.com:taky/joanne