Merge pull request #39 from dnomikos/master

updates & corrections