mantkiew Merge pull request #6 from gsdlab/develop