alex review
small changes
Merge pull request #4 from alexksso/dev

Dev