Minor refactoring
Minor update
Merge branch 'master' of https://github.com/moosbusch/LumPi

Conflicts:
	NOTICE.txt