modified bootstrap to accept exceptions
Merge branch 'dev'