Pull Request - 05-20-2014

This pull requests also has some working changes, which do not necessarily need to be merged - in some instances, they aren't ready yet.

Please only merge the commit from May 19,2014, if possible.