Merge pull request #240 from idank/master