merge
Merge branch 'master' of https://github.com/165pol/in005goethert

Conflicts:
	node.c