Merge pull request #3 from gsdlab/master

Synchronized Master and Develop