Merge pull request #217 from Cook1fan/master

2014-10-17
2014-10-17
Merge pull request #227 from 394802198/master

2014-10-17