Merge pull request #24 from hector3/dev

Dev
Merge branch 'dev' of https://github.com/hector3/beflow.git into dev