Adding siokeds merge request to fix issue 48