reverting commit 41aec61 to make null a defined value
Merge branch 'development'
upgrading version to 3.1.1