0.5.3 -> 0.5.4 (!)
a few more updates for 0.5.4
Merge branch 'master' into alienscience-patch-1