Merge remote-tracking branch 'upstream/master'
Fix and temporary workaround.

Fix for null operand issue.

Temporary work around for the following issues:
https://github.com/mosa/MOSA-Project/issues/25
https://github.com/mosa/MOSA-Project/issues/24
Merge pull request #26 from charsleysa/issues

Issues
Merge branch 'master' of https://github.com/mosa/MOSA-Project