Release 0.4.6
Fix issues #15, #19 en #20 (See github)