Integrated #97 and #100. Sample project is updated.