Merge'
Merge branch 'bleeding' of github.com:svkampen/James into bleeding