Added dictionary, refactoring and basic logic
Merge pull request #1 from oamado/master

Added dictionary, refactoring and basic logic