Finally working
finally working and merged from master