Initial commit
Merged master with new changes