Merge pull request #197 from Cook1fan/master

2014-09-05
2014-09-09
Merge pull request #207 from 394802198/master

2014-09-09