Version 1.5 Stable commit:
- Massive code tidy (added listener class, got rid of some duplication)
- Bug fixes
- First stable release!
Merge remote-tracking branch 'origin/master'