merge and #190 addes string method for typecheck
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14