FW-304. FW-305. Fix.
FW-304. Fix.
Merge pull request #97 from openwsn-berkeley/develop_FW-304

FW-304. Fix.