Added conditional check
Removed the hard coded ip
Merge branch 'master' of https://github.com/radiantbluetechnologies/omar