cleanup
Merge remote-tracking branch 'jessedc/master'