Some new Features #80
Merge pull request #90 from pragm/development

Some new Features #80