SW-154. Fix.
Merge pull request #80 from openwsn-berkeley/develop_SW-154

SW-154. Fix.