Merge pull request #269 from palant/master