merge pull from otland/master