Merge pull request #14 from mebeling/develop

Adds untracked files