First Update

Merging to github