Merged changes with another project back into this library. Fixed a few bugs with nsstring formatting. Added more functionality. Fixed up some formatting.