fixing jslint errors
v1.0.20130712
Merge remote-tracking branch 'origin/master'