Merge pull request #235 from splietker/master