20140415 0634
re
Merge pull request #70 from 394802198/master

Steven
Merge pull request #65 from Cook1fan/master

Steven