Still working on Atte's comments
Start version 0.4.7

Including Sakari's 2nd round of additions.