Added fixes by codestation - added linux support