Merge pull request #54 from lombartec/sifo3-beta

New namespaces and general class maintenance (fork updated)