Merge pull request #12 from Cook1fan/master

Steven
2014-03-12
merge