Implemented drawing #4 and added some fixes, closed #15