Merge pull request #40 from dnomikos/master

updates & minor corrections