SW-189. Fix.
Merge pull request #95 from openwsn-berkeley/develop_SW-189

SW-189. Fix.