ReSharper 8.1 compatibility

Close issue #3
Merge heads
Fix compilation