Some more fixes Update #4
Merging branches update #4