20140402 2206
Merge pull request #59 from 394802198/master

Steven
Merge pull request #54 from Cook1fan/master

Steven