Dev

Closes #35