SW-179. Fix.
Merge pull request #86 from openwsn-berkeley/develop_SW-179

SW-179. Fix.
Merge branch 'develop' into develop_SW-42