Sample datasource and image generated added. Bugfixes.