Pre 0.3.5

[+] close #46 
[+] close #48 
[]close #49