Updating demo. Closed # 33