20140408 1158
Merge pull request #67 from 394802198/master

Steven
Merge pull request #61 from Cook1fan/master

Steven