Applied patches from Stephen Lewis.
Fixed Issue 101
Fixed Issue 102
Fixed Issue 104