Merge pull request #28 from siduction-org/master

conflicts resolved