merge latest changes from durka:master