Merge pull request #114 from dahlberg-fkie/master