Merge pull request #1 from klevron/dev

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

Pull 1
Merge pull request #5 from soju22/test

Test commit