commit by jayli
commit by jayli
Merge pull request #6 from jayli/master

bugfix for slide 1.1