Closes #172
Fix whitespace
Merge branch '2.0' into 2.1
Move private method after protected methods
Merge branch '2.0' into 2.1