Upgrade makefile
Merge branch 'development'
network-transport < 0.5
version 0.4.0