20140417 1504
Merge pull request #74 from 394802198/master

Steven
Merge pull request #69 from Cook1fan/master

Steven