got rid of some compiler warnings
Merge branch 'sintef' of github.com:smistad/SIPL into sintef