Closes #34 - fixed along with #111