Fixes a bug and adds a warning preprocessor directive and an NSLog when using the class and not in Debug mode
Merge branch 'develop'