Merge Maxim's commits from (#64)