Updated readme and some classes
Merge branch 'master' of github.com:GeoKnow/Jassa