Merge pull request #5 from 394802198/master

2014-09-10