Add @return
Update bootstrap
extends \InvalidArgumentException instead of \Exception