Merge pull request #44 from dnomikos/master

updates & corrections