Merge pull request #60 from jodeleeuw/dev

update to v3.1
bug missing "
bug fix other "
Merge pull request #61 from jodeleeuw/master

merge master to dev