Add waf build system, minor code convention changes
Resolve merge issue