Merge issue/10. Fixes #10
Prepare for release 0.2.10