Merge pull request #15 from slavap/master

Simple cosmetic changes, but 25% performance boost under Chrome (thanks to Goktug Gokdogan).
Merge pull request #5 from nippur72/master

Merge pull request #15 from slavap/master