v 1.2
Merge branch 'pr/3'

Conflicts:
	makefile
makefile