Merge pull request #12 from jknowles/Dev

Dev
Merge pull request #16 from jknowles/Dev

Dev
Merge pull request #26 from jknowles/Dev

Dev
Merge pull request #2 from zachmayer/Dev

Catchup to upstream.