140. Bugfixes

Nov 03, 2016