Merge remote-tracking branch 'origin/0.4'

+ bug fixes with retriever
WRetriever and WView - some bug fixes