Pull request for Bugfix #30