Merge pull request #4 from fkassam/master

Merging develop to main
Merge pull request #5 from fkassam/develop

Merge pull request #4 from fkassam/master