Merge pull request #15 from slavap/master

Simple cosmetic changes, but 25% performance boost under Chrome (thanks to Goktug Gokdogan).