Merge pull request #2 from pveeckhout/master

merging formularium branch
Merge pull request #3 from pveeckhout/formularium-fysica

Merge pull request #2 from pveeckhout/master