Fixes Bug 135
Fixes Bug 134
Merge remote-tracking branch 'origin/master'