Merge pull request #12 from oneru/master