Merge pull request #9 from 394802198/master

2014-09-15