Merge pull request #1 from Pickra/master

merging latest updates