Merge pull request #46 from dnomikos/master

updates & corrections