Closes #11
Merge branch 'issue11'