Small adjustments and added demo project.