Issue #11 Solved
Issue #23 Solved
Revert "Issue #11 Solved"

This reverts commit 6e9c6eaebd96250222d4e1597afba2655d341926.
Revert "Issue #23 Solved"

This reverts commit 540f343b351100e8251085cb2c23861cd10203e7.
Issue #23 Solved