#1 fixed unmarshalling bug successor 1 and 2 are now recognised
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14