Merge pull request #42 from Gonthim/master

Complete rework of existing functionality
Need properties example for testing