Updates
Merge branch 'master'

Conflicts:
	src/lib/mpl_lib.py