Merge pull request #345 from tobiasd/20160312-degree