Merge pull request #34 from dnomikos/master

updates, corrections & new files