Added support for static linking