merging all #9

Closed jacobtarter closed 7 years ago