New improvements
Merge pull request #26 from teleyinex/master

New improvements