Merge pull request #6 from ruudvanderweijde/master

Update of declarations
Merge remote-tracking branch 'upstream-cwi-swat/master'