Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from adya/master

Release I (Part 1)