Merge pull request #76 from kapilgoenka/master

expirt fn update
added dev machine host for cors
added check to prevent exception