Updating assembly references
Updating
Merge branch 'master' of https://github.com/idvorkin/onom
Tighter syntax, adding unit tests