Merge pull request #1 from 0mars/master