added support for property checking
general refactoring
tagin 0.5.0