manually merged @soulgalore's PR for issue #75 + code styling nits
manually merged @soulgalore's PR for issue #75 + code styling nits

codeviking/yslow,aaron-goshine/yslow,simudream/yslow,marcelduran/yslow,aaron-goshine/yslow,simudream/yslow,wangyi8412/yslow,wangyi8412/yslow,codeviking/yslow,arjunrn/yslow,arjunrn/yslow