Added option for include margins

Added new option includeMargins to set params true/falase for outerWidth(), innerWidth() etc. Faced position issue with current version, and works perfect when I did this.