Updated build to incorporate pull #13