Merge from yogthos/master