Further improvements, although not quite working as of yet
Merge remote-tracking branch 'origin/master'