Merge pull request #65 from richard-willowit/version61

Merge ictstudio changes, with adjustments.