mantkiew Merge pull request #13 from gsdlab/develop