improved search, cleanup
improved search, tests
cleanup
Merge branch 'master' of github.com:tteodorescu/mas-rad-java