Merge pull request #318 from CGenie/cgenie

Fix for issue 317