Committer: nickvth nickv.vanthart@gmail.com final changes