Merge pull request #1 from hijackert/dev

Dev
added files