Merge pull request #18 from vogler/master

merge vogler/analyzer
cleanup after merging fork