Merge pull request #12 from sakya/master