Few bug fixes and performance improvements

- This version includes several bug fixes and performance improvements
- Thanks for choosing us. Please feel free to contact us at [email protected]. We'd love to hear feedback from you