Initial commit with base functional version
Merge remote-tracking branch 'origin/master'