386 support
merge from dotcloud