Adding forgotten 1.3 features
Merge pull request #98 from lzap/wip

Adding forgotten 1.3 features