revert etc
Merge pull request #11 from pqdev/bobbranch

revert etc