Closes #9,#5