Merge pull request #19 from esteinborn/master

Master to Craig
Title case
Merge pull request #21 from esteinborn/Craig

Craig