36: Minor style improvements
36: Added pre-requisite checking with prereq(); also minor style improvements
Extra unit tests
36: Change notes