Dev commit 1
Dev commit 2
Dev commit 3
Merge pull request #1 from kraihn/dev

Dev