Merge pull request #2 from jaruesink/master

Merge1
Test
Redo
Added status updates
Deleted test file
Merge remote-tracking branch 'origin/Wesley' into Jake