closes #7 #17

Closed jtbairdsr closed 7 years ago