Merge pull request #29 from genialis/master

Merge master to develop
Minifix file testing before adding