Simplified things a bit, removed the need for add
Updated documentation and versions.