fix ResultBuilder
fix OptionBuilder
Merge pull request #36 from pocketberserker/fix-computation-expressions

Fix computation expressions