Initial commit
Merged default code from github