Resolved Issue#22