merge changes from jansch