Merge pull request #1 from ftlabs/master

update