working
Merge pull request #4 from kurunt/dev

working