Minor change
Fix syntax
Minor change
Merge pull request #19 from otknoy/refactoring

Refactoring
Merge branch 'master' into my-feature-branch