Changes to deliver

Changes to deliver
Merge pull request #1 from martincgg/master

Correct