Merge pull request #210 from 394802198/master

2014-09-12
Merge pull request #201 from Cook1fan/master

Merge pull request #210 from 394802198/master