Merge pull request #40 from heil/master