Lots of improvements
Version bump to 0.0.2