Merge pull request #15 from fabianofranz/master

Upgrade to 7.0.3
Upgrade to 7.0.4