Update my fork with all changes to date (06-08-2014)

Hope I'm doing this right..