Merge pull request #186 from Cook1fan/master

2014-06-27
2014-08-22
Merge pull request #194 from 394802198/master

2014-06-27