Merge pull request #8 from bekkibolthouse/master

trying to see if i'll get the pr message...