Fixed:
#173
#174
#177
#184