Squashed commit of the following:

abc: @rovo89 #5