Fix flow and small bug fixes
Merge branch 'master' of https://github.com/estebanroblesluna/abstractions.git