Merge pull request #1 from klevron/dev

Dev
Test commit
Merge pull request #4 from soju22/dev

Pull 1