Merge pull request #37 from dnomikos/master

fix mismatches, updates & corrections