Merge pull request #25 from kimptoc/master