updated content
Merge pull request #322 from Qwinix/issue_305

updated content
Merge pull request #323 from Qwinix/master

Updated content