Fixes #35 and Closes #25