Merge pull request #21 from esteinborn/Craig

Craig
Merge pull request #22 from esteinborn/master

Master to Craig