REFACTOR #4
Merge pull request #53 from mLuby/dev

REFACTOR #4