Merge pull request #5 from skurfer/master

the stuff we talked about