Merge pull request #26 from dnomikos/master

updates & corrections