Resolve
Merge pull request #4 from rap1ds/resolve-like-rockstart

Resolve
Rebase