Re-factor with respect to issuecomment-46747933 and issuecomment-46747935

https://github.com/gwtbootstrap3/gwtbootstrap3-extras/issues/67#issuecomment-46747933
https://github.com/gwtbootstrap3/gwtbootstrap3-extras/issues/66#issuecomment-46747935