Null didn't work as expected :P
Merge branch 'hotfix/0.0.3'