Merge pull request #105 from arjantijms/master

Merge release branch for 3.0.3