Merge pull request #16 from Cook1fan/master

Steven
Merge pull request #17 from Cook1fan/master

just now
2014-03-13
m