General changes, bugfixes.
General changes, bugfixes.
Merge branch 'master' of https://github.com/svkampen/James.git