Updated
Merge pull request #1 from alexdinca/new-stuff

Updated