SW-165. Fix.
Merge pull request #81 from openwsn-berkeley/develop_SW-165

SW-165. Fix.