Merge pull request #149 from lskatz/master