Updated to v2014.0.5 and includes some refactoring/cleanup.