extra-tag removed
simplified
simplified
re-tagged on class level
javadoc + small refactoring
javadoc and refactoring
Merge pull request #293 from pisaychuk/master

Clean-up