merge from master

hmm solving bad habits...