still working on merge
Merge branch 'master' of github.com:tomaszkacprzak/nmb
fixed indexing