Minimized duplicate functions
Merge branch 'master' of github.com:bernilsson/EmergentSystemsProject