Closes #21 rev5