Merge pull request #79 from 2betop/master

merge