Merge pull request #2 from galstrom21/master

Merged automatically by jenkins after successful build test