Ready to submit. #2
Merge branch 'master' into gh-pages
I think im doing this right...