passes its own tests again
Merge pull request #1 from labster/master

update to run under 2012.02.1