Merge branch 'master', remote-tracking branch 'upstream/master'
LAST MINUTE!

DAMN!

Shawn
Merge pull request #7 from ShawnEllis/master

title