Merging to current master...once again ^^