Do not depend on argument order
Merge branch 'refactoring' into v0.0.5

Conflicts:
	README.md