Merge pull request #1 from RoboHAZMAT/master

Sync with master
Merge pull request #6 from gbledt/master

Merge pull request #1 from RoboHAZMAT/master