SW-142. Fix.
Merge pull request #67 from openwsn-berkeley/develop_SW-142

SW-142. Fix.