Added block and refactor
Merge pull request #6 from igor04/block

Added block and refactor