Merge pull request #59 from kweek/master

greatness
have to