Last commit for 1.1.1

Fixed the pointer issue with help from stack exchange user birgire