Merge pull request #3 from kkochis/master

Updating to latest in master