Merge pull request #56 from dnomikos/master

updates & corrections