Merge pull request #36 from dnomikos/master

updates & corrections