Merge pull request #8 from stoe/master

Thanks!
Fixing display of XTYPE in component treegrid
Minor updates
Merge pull request #9 from arthurakay/master

Bug fixes, minor code changes