Fixed some stuff that probably went wrong with previous a merge.
Merge pull request #94 from jeroen940/craneMergefixes

Fixed some stuff that probably went wrong with a previous merge.