Merge pull request #2 from basestyle/master

111