Builder improvement
added sample project