Closes #21 rev3