mantkiew Merge pull request #81 from gsdlab/develop