Add test which reproduces the issue #651
Overwrite super's designated initializer
Remove unnecessary nil checking
Add test for disposing
Minor style fix
Merge pull request #652
Merge branch 'master' into 2.0-development