enabled, documented, refactored
Merge pull request #310 from pisaychuk/master

enabled, documented, refactored