Merge pull request #227 from 394802198/master

2014-10-17