Merge pull request #1 from bradbishop/master

need this for upcoming delivery