my updates
Merge https://github.com/dtytomi/rapper