Merge pull request #2 from Vengage/master

Rebase
Merge pull request #3 from Vengage/vasile

Merge pull request #2 from Vengage/master