Shipping fix
Merge pull request #3 from d-g-h/iss2015Update

Shipping fix