First commit
Merge origin/master into baseFunctionality
Merge pull request #1 from asaf050/baseFunctionality

Base functionality