Merge pull request #4 from nvk/master

Lots of new ones
fixed merge
Merge remote-tracking branch 'upstream/master'