Merge pull request #183 from Cook1fan/master

2014-06-27
2014-08-21
Merge pull request #190 from 394802198/master

2014-08-21