Merge branch 'refactor'

# Conflicts:
#	README.md
