Merge pull request #8 from abalmos/raml/v0_2

Raml/v0 2 - tweaks as a result of tech call discussions