Issue #25 Solved
Issue #24 Solved