Closes #21 rev4