Changed minor implementation details; Added an ordinary test example.