Fixed 33

Closes #33
Merge branch 'iss33'