Ammending previous commit regarding #pr49. All comments but one integrated.