Fixes and updates.
Merge pull request #7 from lavigor/main

Fixes and updates.