Fixed Issue #3 and Issue #14

andrewberls

~requested: 400