Added some new features, updated the Readme, added tests for import from CSV