Merge branch 'lanec:master' into master