Revision 12

#133
#134
#135
#136
#137
#138
#139
#140
#141