SW-187. Fix.
Merge pull request #94 from openwsn-berkeley/develop_SW-187

SW-187. Fix.