Merge pull request #209 from 394802198/master

2014-09-11
Merge pull request #200 from Cook1fan/master

Merge pull request #209 from 394802198/master