Solved #13 and #14