mantkiew Merge pull request #14 from gsdlab/develop