+ Added quick and dirty vector version
...