Applied changes from #47