Merge pull request #19 from awlayton/master

Mergre raml/v0_2 into Master