Version 2

Closes #5