Towards 0.2.0.
Merge pull request #34 from vjovanov/master

Towards 0.2.0.