Merge pull request #327 from adik/master