Minor additions.
Merge branch 'dev'
Merge pull request #10 from cythoplazma/master

Merge request.