Completed the fileLoader, Wave interpretation next.
Merge remote-tracking branch 'origin/master'