Fix for issue #64 and tweaks in contrib

- Fix for #64
- Tweaks in contrib