Merge pull request #1 from Salcomp/master

pull test
Merge pull request #2 from Jakoviz/master

Merge pull request #1 from Salcomp/master