This reverts merge request !11 (merged)

The merge of this branch FAILED into the master since the release version 0.2.6 was introduced previously in nexus.

A new merge for this branch will be created with a changed version due to the introduction of the release version to fix the issue.