Update

- Bug fixes
Merge pull request #15 from ipritoflex/master

Update