Adaptions to changes made by SVT
Another fix related to SVT changes
Merge pull request #31 from JeppeTh/master

Adaptions to changes made by SVT