changed bugs, changes, corrected demo, put demo.r in builds directory