blah
Merge pull request #26 from Dunkleosteus/master

Updated?