Merge pull request #4 from LlamaNL/master

First Draft of Properties Dialog