merged master and gtk# branches