Merge pull request #2 from shreddd/master

pull in changes from master