Maintenance release
Merge pull request #32 from golnazads/master trying to fix the build error, copied from reference service that Nemenja fixed
Merge pull request #32 from golnazads/master trying to fix the build error, copied from reference service that Nemenja fixed