Version & Dump, remove conflicts with the stubs
Merge pull request #15 from mruz/stubs

Version & Dump, remove conflicts with the stubs