Fixing Memory (getting rid of optional stuff)
Merge branch 'master' of https://github.com/bdwashbu/scala-x86