Merge pull request #81 from galstrom21/master

Merged automatically by jenkins after successful gate test