Big Update

 Another way to work. This is version 3.0
Merge pull request #3 from raymondidema/development

Big Update