nop fix, CPU-script update and template removal.
Merge branch 'master' of github.com:terjr/arm-project