fixes #3

Fixing (hopefully) and adding to Master