Merge pull request #198 from 394802198/master

2014-06-27
Merge pull request #190 from Cook1fan/master

Merge pull request #198 from 394802198/master