Merge pull request #192 from Cook1fan/master

2014-08-28
2014-09-01
Merge pull request #201 from 394802198/master

2014-09-01