Merge branch 'master' of https://github.com/Timidger/mackup

Conflicts:
	tests/utils_test.py
Merge branch 'master' of https://github.com/Timidger/mackup