Merge branch 'develop' into fragmentSwitch
Merge pull request #30 from haavardlian/fragmentSwitch

Merge branch 'develop' into fragmentSwitch