Merge pull request #1 from Jenko-Rebec/master

DN1
Merge pull request #6 from cythoplazma/master

Merge request.
Merge pull request #7 from asa2014/master

Merge pull request #1 from Jenko-Rebec/master
Merge pull request #2 from Jenko-Rebec/master

Merge request.
Merge pull request #11 from asa2014/master

Final