- Added a number of headers to the umbrella header or XCode 6.1 will warn about missing headers.
- Fixed a typo that would prevent compilation.
Merge pull request #367 from mike-lischke/master

Some small improvements + a compile fix