20140417 1121
Merge pull request #72 from 394802198/master

Merge pull request #66 from Cook1fan/master
Merge pull request #67 from Cook1fan/master

Steven