closes #72 #75

Closed alexf4 closed 8 years ago