That's it

Copy of #4, updated to develop branch.