Different improvements.
Merge pull request #2 from m1kc/master

Different improvements