Merge pull request #66 from pferate/unittest2

unittest2 for 2.6 compatibility