SW-153. Fix.
Merge pull request #78 from openwsn-berkeley/develop_SW-153

SW-153. Fix.