Merge pull request #1 from marczhermo/master

update to version 3.0.3
Merge pull request #2 from marczhermo/marczup

Marczup
Merge remote-tracking branch 'upstream/master'