Issue #286 fix includes and JS code