Merging flackstyling into master