Merge pull request #17 from esteinborn/master

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

Craig