Merge pull request #26 from p1tz/master

merge
Merge pull request #27 from p1tz/master

merge
Merge pull request #28 from p1tz/master

merge
added additional logging information
add counting to index