Merge pull request #1 from dnomikos/master

some updates and fixes
fix
Merge pull request #2 from dnomikos/master

some updates and fixes