[Issues] Working on #25. Fixed #26.