Merge pull request #3 from stefanius/master

Merge with master
Merge pull request #7 from stefanius/master

Merge to brigval
Merge pull request #10 from stefanius/brigval

Brigval