Sync develop and master branches after fixing issue #17