Merge remote-tracking branch 'henryboldi/master' #63

Closed adam-keim closed 8 years ago