Merge tag '0.0.4' into develop

0.0.4
Added functionality for active marking

Signed-off-by: steigr <me@stei.gr>
Merge branch 'release/0.0.5'