More refactoring...
Fixed License.md
Added more tests.
Merge branch 'master' of github.com:gertjvr/ChatterBox

Conflicts:
	LICENSE.md