bug fixes
Merge branch 'bizionics' into devel