Merge pull request #208 from Cook1fan/master

2014-10-02
2014-10-06
Merge pull request #218 from 394802198/master

2014-10-06