Manual merge of #24
Merge branch 'master' of https://github.com/advancedrei/PortableRest

Fixing conflicts