Corrected 4.1 jshing errors and ready for merge