Updates for 2.7
Merge pull request #69 from lsuits/master

Updates for 2.7