Updated the check on emptiness for Singeltons.
Merge branch 'master' of github.com:punkave/apostrophe