Assembly Parser + unit tests
Merged master, conflicts resolved.