Merge 6/11/14

Tyler Changes 6/11/14
Issue #15 and #16