Merge remote-tracking branch 'origin/patrick'
Merge branch 'master' of https://github.com/pemami4911/Osprey