Resolves #122
Merge branch 'master' of https://github.com/XboxChaos/Assembly