Merge
Rename files, minor tweaks
Update readme.md
Merge pull request #1 from mixu/master

Minor tweaks