Merge pull request #1 from lambda2/master

Master
Merge pull request #2 from lambda2/merge-cretaill

Merge cretaill
Merge pull request #3 from lambda2/andre

Andre