Merge pull request #165 from roskoff/master