Merge pull request #45 from maksbotan/master