Lots of improvements and bug fixes
close #1