Solved #124
Solved #104