Merge pull request #27 from okcomputer1982/work/warren

Work/warren
Merge pull request #28 from okcomputer1982/master

Merge pull request #27 from okcomputer1982/work/warren