Merge pull request #42 from dnomikos/master

updates & corrections