updates
Merge pull request #29 from facoptere/update1771

updates