closes #24 #25

Closed lmartins91 closed 8 years ago