Merge pull request #2 from Liteom/master