Merge branch 'master' of github.com:borin-z/mpla

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'