Fixed bounds

The previous bounds allowed values which would fail. 
It has to hold that ini >= kj  and  inj >= ki which is guaranteed by the new bounds.
Bits of clean up
Merge pull request #86 from GeorgOstrovski/patch-3

Fixed bounds