Made some more properties

Made some more properties for easier customization when using cocoapods (as you can't change the defines when using pods)