Merge pull request #30 from dnomikos/master

corrections