reverting rpedde's mod from fd73064e0
Merge pull request #85 from galstrom21/master

Merged automatically by jenkins after successful gate test