Pre-release fixes
Merge pull request #82 from mitchellgordon95/master

Pre-release fixes
Added some fixes.
Updated line numbers to reflect pre-release fixes
Merge pull request #84 from mitchellgordon95/master

Updated line numbers to reflect pre-release fixes
Added import for import android.view.WindowManager;