merge changes from durka:master