Closes #77 Replaced NULL with nullptr where possible