Fixed Issue #33
Merge pull request #43 from jdtran23/master

Fixed Issue #33
Merge remote-tracking branch 'upstream/master'