Merge pull request #5 from kennandelmar/master

pulling from master
update
Merge pull request #8 from kennandelmar/Ken

Ken