jefferis Merge pull request #13 from natverse/Feature/bugfixes1