Alot of work
Merge pull request #16 from odeanmaye/master

Alot of work