changes from minute
Merge branch 'master' of github.com:nabble/ajde