Updated version number
Merge remote-tracking branch 'nancy/master'