some stuff
Merge pull request #15 from GridControl-Team/stuff

merging some stuff.