Added version and little improvements