fix #12
Merge pull request #13 from MedMack/V1bugs

fix #12