Mergre raml/v0_2 into Master

Did the merge in my fork first because there were conflicts.