fixed warnings
fixed typo
Merge branch 'mybranch'

Conflicts:
	src/FirstModule.py