commit
Merge pull request #1 from phaistosrobert/master

sure, it's fine