Namespace

Includes Julians #184, addresses issue #187