Holy shit
Merge branch 'devel' of github.com:kevr/put into stable

Conflicts:
	Makefile