Merge pull request #1 from floq-design/master

Bug: correction...