updates
Merge pull request #30 from facoptere/update1771

updates