Corrected JShint errors and ready for merge