Merge pull request #9 from mlhim/master