done
Merge pull request #4 from haazime/refactor-rename

done