Getting master branch on Bayk's branch

Getting Started on Bayk's branch