Merge pull request #4 from eakjb/dev-main

MVP
Merge remote-tracking branch 'origin/dev' into dev-main