26-05-a
Merge Tobias and Kostas changes
Merge pull request #13 from kdop/master

conflict resolved