closes #14 #31

Closed sofiengwin closed 8 years ago