Fix undefined names

Fixes: #80
Acknowledge sebastinas' contribution

Thanks for reporting and fixing the undefined names in the source files.
Merge branch 'sebastinas-undefined-names'