cook 2014-03-20
Merge pull request #41 from 394802198/master

Steven
Merge pull request #30 from Cook1fan/master

Steven