bug fixes and better API
0.2.0