Merge branch 'pr/4'

Conflicts:
	src/main.c