fixed untracked files
fixed #3
Merge pull request #27 from andrewvergel/dev

Dev