"Done" Ticket #216.
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14