Closes #55 needs tests now