combined
Merge pull request #18 from kurunt/dev

combined