Merge pull request #379 from joshuawarner32/master

ASM refactoring