Feature/adding support for net40