fixes a bug related to #491;
resolves #499
fixes a potential bug that may incur null pointer exception
Tutorial merged
Merge branch 'dev-1.8' of https://github.com/PowerPointLabs/repo into dev-1.8

Conflicts:
	PowerPointLabs/PowerPointLabs/PowerPointLabs Quick Tutorial.pptx