Merging bossprotype and master