Close #22. Feature implemented and redundant code removed.