Fixed #1
fixed #2 and formatted gruntfile