Merging to master at the end of Fall 2017 #13

Closed karanseq closed 6 years ago