Merge pull request #1 from karamfil/feature/refactoring

Feature/refactoring
Merge remote-tracking branch 'upstream/master' into feature/refactoring
val()