Merge branch 'master' of https://github.com/vranicnikola/networkapi