Initial Commit
Merge pull request #1 from jwendl/master

Initial Commit
Merge pull request #1 from Magenic/master

Pull from root