Fix #1. Update namespace and minor fixes.