merge from author

merge from /banq/jdonframework