Merge pull request #5 from mlhim/master

Update to master