commit 1.5
Merge branch 'master' of http://github.com/Hermetian/dropbox-spaceman

Just starting