Merge pull request #112 from dahlberg-fkie/master