cleaned up formatting, moved around
Merge branch 'master' of https://github.com/adnanaziz/publicadnan