Merge pull request #18 from esteinborn/Craig

Craig
Merge pull request #19 from esteinborn/master

Master to Craig