Synchronized the github code with local repo code. Fixed code too. Really