cook 2014-03-21
Merge pull request #42 from 394802198/master

Steven
Merge pull request #31 from Cook1fan/master

Steven