Merge branch 'dev-new' into dev-patrick
Merge branch 'dev' into dev-patrick
Updated version
Merge pull request #12 from Patricklee1014/dev-patrick

Dev patrick