Fix for issue 231
Fix for GU issue 264
Merge pull request #4 from stenbacka/gu-issues-1

Gu issues 1