Merge pull request #13 from esteinborn/Craig

Craig
Merge pull request #14 from esteinborn/master

Master to Craig