Merge pull request #2 from pveeckhout/master

merging formularium branch