Fixed bugs; nicer output
Version 2.1