added 386 for travis builds
merge conflicts