Merge pull request #7 from leesper/master