Created base version
commiting changes from late sunday
Merge remote-tracking branch 'origin/master'