Merge pull request #1 from Jenko-Rebec/master

DN1
Merge pull request #7 from asa2014/master

Merge pull request #1 from Jenko-Rebec/master