Use namespaces
Merge pull request #2 from aliasm2k/fix-img

Use namespaces