Merge pull request #10 from broganross/master