Modified for SIGILL on Android
Modified for InternalWebServer readium problems.
merge