Added some previous work
conflict removed
Merge pull request #1 from Stsebas/master

Previous work