Fixed bugs again
Merge pull request #33 from kraftery/bori2

Fixed bugs again