SW-145. Fix.
Merge pull request #71 from openwsn-berkeley/develop_SW-145

SW-145. Fix.