Fix.
Merge branch 'master' of github.com:LancasterLogRes/Assemble
Once again killed duplicate code.