jacob-carlborg Merge pull request #276 from Inkrementator/master