Fixing things

Fixes #11 
closes #11