Changed namespace, since I added some more features which does not belong to the original code.