Merged everything to my own copy of develop branch (at last)