More improvements
Merge pull request #2 from lord2800/master

More improvements