Merge pull request #10 from IsabelLage/master

updates
BMPyr corrected
some changes