mantkiew Merge pull request #31 from gsdlab/develop