Flags, operands and all that jazz
Merge pull request #91 from Ricky1833/master

Flags, operands and all that jazz
Merge pull request #35 from IanJRigg/master

late nite pull