#28 #27 fixed
jshint validation