Merge pull request #2 from gever/master

bringing this up-to-date with the main repo