Merge pull request #4 from VirtualFlyBrain/master

Bring up to date
Filtered changed from DOS Sandbox
Merge pull request #101 from Robbie1977/master

Filtered changes from DOS Sandbox