Merge pull request #214 from Cook1fan/master

2014-10-14
2014-10-14
Merge pull request #224 from 394802198/master

2014-10-14