Merge pull request #185 from nijil/master

Added a couple of fields