Update

- Some improvements
Merge pull request #21 from ipritoflex/master

Update