Merge pull request #6 from lavigor/main

Many improvements.
Typo
More improvements
More improvements
Fixes and updates.