Merge pull request #98 from salzmdan/master