Latest 1.7
Merge pull request #3 from ruprict/1.7_snapshot

Latest 1.7
Merge conflicts