Issue #887/#888

The PR includes fixes for #887 and #888 (file vesron).
could you align the two checkboxes?

http://i.imgur.com/zFdwyLe.png