Start working on version 0.4.6

Incorporating Atte's comments.