My first pull + I did all my best to improve this project :)