Added todo
Updated and prepare release
Merge Master