Added Listener. Formatting fixes.  resolves #3