updates
Merge pull request #8 from clandere/master

updates