Fixes: #176 (This issue has been closed earlier but wasn't resolved). Now migrated to null safety, upgraded dart sdk, tested all the changes. #240