started with confirmation, commiting for merge
Sunday merge
Merge pull request #25 from tedjk/master

Merged with saturdays work of wall team