updated
Merge branch 'dev' of https://github.com/GurudayalKhalsa/G into dev