Merge pull request #35 from dnomikos/master

updates & corrections