Fixed Issue #1 and added documentation