Merge pull request #1 from dorton/master

yey!
ok
coolbeans