Merge pull request #23 from dnomikos/master

updates & corrections