Merge pull request #1 from openfortec/master

equal to master after 1st version
Merge pull request #2 from openfortec/firstgitV1.0

Merge pull request #1 from openfortec/master