Changes for port
Merge branch 'master' of https://github.com/shahzadzafar11/bitstarter