Merge pull request #4 from galileo/master

Merge master to develop
Merge pull request #6 from galileo/develop

Align master to develop