Merge pull request #6 from dcaff/master

Pull for checking
checked bootstrap
Merge pull request #5 from JackStat/master

fix