Merge pull request #54 from cburbridge/v2-devel

V2 devel