Merge pull request #202 from Cook1fan/master

2014-09-13
2014-09-15
Merge pull request #212 from 394802198/master

2014-09-15