Merge pull request #1 from way2muchnoise/master

the basic stuff