Bugfixes
New module with example