Merge pull request #9 from gavanderhoorn/master

Fix issue #7 ('non-homogeneous workspace' error)