Initial commit
made some changes
Merged with remote