fixes #18
fixes #2
Merge pull request #44 from mpetitdant/bootstrap3

fixes #18