[#237] Getting ready for master merge