Posix/ISO issue
Merge branch 'master' of github.com:espena/sosicon

Conflicts:
	src/command_line.cpp