Merge pull request #33 from dnomikos/master

updates & fixes