Version 1.0.2

Nothing new from 1.0.1, apart from reorganising some files and categories as I had some problems with the cocoa pods build.