scyncing fork branch with upstream/master
Merge pull request #16 from givenm/master

scyncing fork branch with upstream/master