Direct count support added
Data retrieval removed from test
Merge branch 'master' of https://github.com/memaldi/SWAnalyzer