Bug fixes & updated sample project