Merge pull request #7 from thebirn/master

pull