Fix for AE-274
Merge pull request #9 from laeubi/master

Fix for AE-274