fix warnings
Merge branch 'fixwarn' of https://github.com/rwcarlsen/cycamore into rwcarlsen-fixwarn
Merge branch 'rwcarlsen-fixwarn' into develop