Merge rbelec-issue#8 into rbelec-master

Merging changes from rbelec-issue#8 to synchronise with the `rbelec-master`