Merge pull request #1 from joshuamaxwell/joshua

mostly done
Merge remote-tracking branch 'origin/master' into joshua