Merge pull request #9 from briardes/master

Github being bad