start implementing #6
Merge pull request #1 from neiluJ/remotes

applying latest changes