Changed listener model
Merge branch 'master' of github.com:GideonLeGrange/swap-java