Merge pull request #188 from Cook1fan/master

2014-06-27
2014-08-26
Merge pull request #197 from 394802198/master

2014-06-27