SW-97. Fix.
Merge pull request #51 from openwsn-berkeley/develop_SW-97

SW-97. Fix.