Merge bleeding for new features and bug fixes for v1.0.3

This pull request fixes many concerns and bugs with the plugin. Many changes and optimizations have been done.