Merge pull request #1 from benk691/dev

Updates to files