Completed issues #13, 14, 15

@jcneally
~requested: 700