Fix #24 cleaning namespace

Fixing #24.