refs #54
refs #54
refs #54 - finished modification
refs #54
Merge branch 'master' into 54
refs #54 - fixes build problems, upgrades to new api
Merge pull request #56 from cinovo/54

refs #54