Merge pull request #31 from dnomikos/master

updates & corrections