Fix compile breaking bug
Merge branch 'dev' into dox