Fixes for [FUSEIDE #102 #101 #98 #97]
Merge pull request #103 from punkhorn/integration2

Fixes for [FUSEIDE #102 #101 #98 #97]