Bug fix and example usage