Update/remove comments
Rename
Rename internal
Merge branch 'master' of https://github.com/ruslo/sugar