some updates from offi
Merge pull request #68 from sarakha63/develop

some updates from offi