Add namespace & fix include : Fix #2