Merge branch 'master' of https://github.com/infoscout/pymstr

Conflicts:
	setup.py
merge fix