updates
Merge branch 'master' of github.com:sfrost/pgopen2014
Fixed