Merge pull request #47 from stevage/parking-types