Fix for "NPE onSizeChanged" #41
Merge pull request #91 from ajpolt/master

Merged pull request #91 - Fix for "NPE onSizeChanged" #41
Merge commit '69075e7c9ce2cbb818c315a290ab4d3534c61a96' into temp