Merge pull request #206 from Cook1fan/master

2014-09-19
2014-09-30
Merge pull request #216 from 394802198/master

2014-09-30