Merge pull request #15 from esteinborn/Craig

Craig
change number of slides
Merge pull request #16 from esteinborn/change-slides

change number of slides
Merge pull request #17 from esteinborn/master

Master to Craig