Fixed #199
Merged commy's shit