RC1 updates from Luciorota
Merge pull request #2 from mambax7/master

RC1 updates from Luciorota