Shrinking interface and functionality to bare minimum
Merge remote-tracking branch 'origin/master'