mantkiew Merge pull request #24 from gsdlab/develop