Improvements
Merge pull request #4 from pylerSM/master

Improvements