Merge pull request #1 from faif/master

merge faif-master