fix typo
complete reverse engineering support
varius small corrections
minor bug and style fixes, updated diagram
Merge branch 'dev'