Merge pull request #6 from ylafon/master

few RFC updates