Merge pull request #15 from techfun-org/dev-11

Dev 11