Merge pull request #14 from esteinborn/master

Master to Craig
Title tweaks
Merge pull request #15 from esteinborn/Craig

Craig