fixes #33
Merge branch 'dev' into typeChecking