New version released with reorganization, and bugfixes
Merge pull request #3422 from sabymike/master

New version released with reorganization, and bugfixes