Closes #186
Closes #186

Also fixes some little glitches on other points of the specification

felipevicens/son-gkeeper,sonata-nfv/son-gkeeper,felipevicens/son-gkeeper,alfonsoegio/son-gkeeper,alfonsoegio/son-gkeeper,sonata-nfv/son-gkeeper,dang03/son-gkeeper,sonata-nfv/son-gkeeper,felipevicens/son-gkeeper,dang03/son-gkeeper,dang03/son-gkeeper,alfonsoegio/son-gkeeper,jbonnet/son-gkeeper,felipevicens/son-gkeeper,sonata-nfv/son-gkeeper,jbonnet/son-gkeeper,jbonnet/son-gkeeper,jbonnet/son-gkeeper,alfonsoegio/son-gkeeper,dang03/son-gkeeper