edited in gibhub
Merge pull request #1 from anderssonj2/master

edited in gibhub