Merge pull request #201 from anatoliychakkaev/master

Some tweaks
Revert validatable fix