fixed #21, demo issues.