Code Refactor and Upgrade versions#1

gbzarelli wants to merge 2 commits intomapteb:mastermapteb/simple-state-machine:masterfrom

gbzarelli:mastergbzarelli/simple-state-machine:masterCopy head branch name to clipboard