Merge pull request #25 from jrmontag/master

unexpected gnacs hacking session