Merge pull request #15 from dnomikos/master

updates & corrections