Fixed minor index issue, introduced some new more brutal issues
Merge branch 'master' of http://github.com/halldorel/hv2