Merge pull request #2 from yehppael/master

add waste full functionality and tests
Extract research to its own class
merged and fixed conflict
merged and solved conflict