Merge pull request #2 from kvint/dev

Dev merge