mantkiew Merge pull request #27 from gsdlab/develop