Merge branch 'icedreamer/Wreck-Fix' into develop

Closes #185