Added native build
Cosmetics