bugfixes
pull to push

Merge branch 'develop' of https://github.com/zatricion/NetSim into develop