Initial commit
Merge origin/master
Merged, edited readme file