SW-188. Fix.
SW-188. Fix.
Merge pull request #96 from openwsn-berkeley/develop_SW-188

SW-188. Fix.