Merge branch 'xaedes/master'