Merge pull request #34 from andrijapanicsb/patch-4

sync QiG with the same guide in master branch