Device::wait now takes multiple arguments
A bit of cleanup
Fixed include
Added escape and unescape script methods + various fixes
Merge branch 'release/0.9.4'