Merge pull request #45 from dnomikos/master

updates & corrections