tymat Merge pull request #6 from alexhanh/master