SW-135. Fix.
Merge pull request #66 from openwsn-berkeley/develop_SW-135

SW-135. Fix.