mantkiew Merge pull request #3 from gsdlab/develop