Reversion- The Escape Works

Tested on Ubuntu 14.04 64-bit.
Merge pull request #161 from suitablehost/master

Reversion- The Escape Works