apparently, the dev branch isn't really where development should be sent to, so rebased to master to ensure PR without conflicts.
M. Kasim