netj/3x — pull request #23 by jaericson (2014-02-17 19:03:54+00:00)
Title: Continued Updates Before Refactoring

Fixing a few issues