Merge pull request #137 from way2muchnoise/1.7-update

implemented fluorine upgrade