Merge pull request #18 from sbyx/master