fb,diamond
Merge pull request #3 from petrnagy/master

fb,diamond