Regular commit
Merge pull request #1 from Max-Levicky/dev2

Regular commit