Merge pull request #52 from dnomikos/master

updates & corrections