gabrieliuga Merge pull request #1 from adremides/master