Merge pull request #2 from InnovationsIT/dev

Dev
Merge pull request #3 from InnovationsIT/master

Merge pull request #2 from InnovationsIT/dev