Merge pull request #6 from 394802198/master

2014-09-10