Minor refactoring. Shield connection needs lots of work.
Merge pull request #248 from jorgesilva/develop

Minor refactoring. Shield connection needs lots of work.