Merge branch 'master' of http://github.com/halldorel/hv2
Merge branch 'master' of http://github.com/halldorel/hv2