Merge pull request #10 from bitonic/master