Merge pull request #1 from openfortec/master

equal to master after 1st version