Use interceptor to handle API stuff
Merge remote-tracking branch 'origin/master'