updates+fix merge conflict
updates+fix merge conflict
Merge pull request #45 from facoptere/update1771

fix merge conflict