Biostar2

Solves #218, #219. This is my first try to contribute to the project :-)