new changes
Merge https://github.com/joemie/misc