Merge pull request #313 from salzmdan/master