Added code for handling boundary values and no network connection
branch merge