Merge pull request #85 from BallisticLingonberries/master