Initial commit with basic features working
Merge remote-tracking branch 'origin/master'