Merging master
Merge pull request #14 from dougqh/operation-rewriting

Operation rewriting
Merge pull request #17 from dougqh/disassembler

Disassembler
Merge pull request #18 from dougqh/disassembler

Disassembler
Merge branch 'master' into disassembler